From f4af3a5ad020dc31b8e2afd374e5613cbaf7ed0c Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 13 Dec 2025 09:32:27 +0100 Subject: [PATCH] we-dont-have-the-needed-fonts Gbp-Pq: Name we-dont-have-the-needed-fonts.diff --- sw/qa/core/text/text.cxx | 5 +++ vcl/qa/cppunit/complextext.cxx | 43 ------------------------ vcl/qa/cppunit/pdfexport/pdfexport2.cxx | Bin 280936 -> 281320 bytes 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index 8487c15002b..1994ed97b76 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -9,6 +9,8 @@ #include +#include + #include #include @@ -1594,6 +1596,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) CPPUNIT_ASSERT_EQUAL(521, nHeight); } +/* needs Source Han Serif SC*/ +#if HAVE_MORE_FONTS CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) { // Load the document. @@ -1630,6 +1634,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) } } } +#endif CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testScriptinfosurrogatePairs) { diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 9be428b5912..a833314bd23 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -792,49 +792,6 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510) } } -CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104) -{ - ScopedVclPtrInstance pOutDev; - - vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } }; - pOutDev->SetFont(aBaseFont); - - vcl::Font aFallbackFont{ u"Noto Sans Arabic"_ustr, u"Regular"_ustr, Size{ 0, 72 } }; - pOutDev->ForceFallbackFont(aFallbackFont); - - pOutDev->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::BiDiRtl - | vcl::text::ComplexTextLayoutFlags::BiDiStrong); - - auto aText = u"\u05D0\u05D0\u05D0\u0644\u0627"_ustr; - KernArray aKernArray = { 100, 200, 300, 350, 400 }; - auto pLayout = pOutDev->ImplLayout(aText, /*nIndex*/ 0, /*nLen*/ aText.getLength(), - /*rLogicPos*/ Point(0, 0), /*nLogicWidth*/ 0, aKernArray); - - // Fallback must have happened for this test to be meaningful - auto pMultiLayout = dynamic_cast(pLayout.get()); - CPPUNIT_ASSERT(pMultiLayout); - - std::vector aCharX; - - const GlyphItem* pGlyph = nullptr; - basegfx::B2DPoint stPos; - int nCurrPos = 0; - while (pLayout->GetNextGlyph(&pGlyph, stPos, nCurrPos)) - { - aCharX.push_back(stPos.getX()); - } - - // tdf#154104 caused overlapping glyphs in fallback runs: - // { -295.0, -195.0, -95.0, -341.0 } - std::vector aRefCharX{ -245.0, -145.0, -45.0, -341.0 }; - - CPPUNIT_ASSERT_EQUAL(aRefCharX.size(), aCharX.size()); - for (size_t i = 0; i < aRefCharX.size(); ++i) - { - CPPUNIT_ASSERT_DOUBLES_EQUAL(aRefCharX.at(i), aCharX.at(i), /*delta*/ 0.2); - } -} - CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf163761) { ScopedVclPtrInstance pOutDev; diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index bddf05c24b11f33dec04ae65abc3b8072c91716f..b0f547ad4c70d8d8234da380633f4e15aa71f79f 100644 GIT binary patch delta 924 zcmZ8e-%Aux6lV8iOOl&Q7NnKO@WJ)RE=xbmtUxfxhoX#p5u@4Zx-&S=#hE+1M421; z6jacX7mY>N4C<*Kf*zx%dWw3CAQHAP=)wMj?wOg^#bKCp?{~iMJKw#t@i?*ZBvG7? z%tznA?9yB}dMJEKo3q zB~v(JqlUW0G#ke*1PT&lJ%L0vZRO2SHyo~Z{#;>jFGu#1dY@&wDwDwrt`hkt8a7=m zYpEatC%L0MVue(9x-p%Wx0m2_R8{S2q_?R*GjRMwQo*;Vb-8oL-i4=ts$I&IJ4-)i zdK%Kc=*w3a43|Uqpq2FN&taU1Gm~u%$w4J2iTw0Cnx^ji610bc^%C?GF)`dK??fUy z<*qU`hrNeY=pg#5Dx^Z_dle27w1PmRQ9XXR%uhH<_}_1Ej%vpX7>Nh{8mIUH&Qh=V zz#l1RegPiX;>?DAR4FheI=>A2!^w9aMcd?N1)AmkW!OzVJ`$_I5&37K4!Kl;xJ=6J z$eESxNV%T#c||$Dtmi1?VEvd>ZKEdmm+S|iaq)qPlyJ=HuB3n0K{7wb#|kvnbek18 z6rLu&3ZsNyUxgN`Vim4YO)LTn>nZtq5qes-E(md!{-k!-&t|rs%;c`aYHnz0YBqgh6SMeqo;l14)4wY-hfL>R z&g{Rvwu{+;ar%S>%q-Kj=P?USx4*>9y6pn9Ce!r(1whq6uFUjf3xGtx`aOf;%QEsDH s9fic8)Z~(A3y_pDqa{Se*`>_<(|Lg^_)Xy|%wjdIxwf+`V}7y(08Wr